projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0afa944 7ac608f)
bitkeeper revision 1.1236.1.34 (4221a315ShkFw2X--zS0IOD04zHUnA)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Sun, 27 Feb 2005 10:38:13 +0000 (10:38 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Sun, 27 Feb 2005 10:38:13 +0000 (10:38 +0000)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
linux-2.4.29-xen-sparse/include/asm-xen/system.h patch | diff1 | diff2 | blob | history
linux-2.4.29-xen-sparse/mkbuildtree patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc linux-2.4.29-xen-sparse/mkbuildtree
Simple merge
Unnamed repository; edit this file 'description' to name the repository.